From 03f5d1f1c5801af9a0761b68148a819510111063 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Fri, 14 Dec 2007 13:51:02 -0700 Subject: [PATCH] [IA64] Move asmmacro.h from linux-xen to linux Signed-off-by: Akio Takebe --- xen/include/asm-ia64/linux-xen/asm/README.origin | 1 - xen/include/asm-ia64/linux/asm/README.origin | 1 + xen/include/asm-ia64/{linux-xen => linux}/asm/asmmacro.h | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename xen/include/asm-ia64/{linux-xen => linux}/asm/asmmacro.h (100%) diff --git a/xen/include/asm-ia64/linux-xen/asm/README.origin b/xen/include/asm-ia64/linux-xen/asm/README.origin index 7a20f1a035..9d21ebf40f 100644 --- a/xen/include/asm-ia64/linux-xen/asm/README.origin +++ b/xen/include/asm-ia64/linux-xen/asm/README.origin @@ -6,7 +6,6 @@ # easily updated to future versions of the corresponding Linux files. acpi.h -> linux/include/asm-ia64/acpi.h -asmmacro.h -> linux/include/asm-ia64/asmmacro.h atomic.h -> linux/include/asm-ia64/atomic.h cache.h -> linux/include/asm-ia64/cache.h gcc_intrin.h -> linux/include/asm-ia64/gcc_intrin.h diff --git a/xen/include/asm-ia64/linux/asm/README.origin b/xen/include/asm-ia64/linux/asm/README.origin index 1167eab7d2..bd7e269b94 100644 --- a/xen/include/asm-ia64/linux/asm/README.origin +++ b/xen/include/asm-ia64/linux/asm/README.origin @@ -4,6 +4,7 @@ # needs to be changed, move it to ../linux-xen and follow # the instructions in the README there. +asmmacro.h -> linux/include/asm-ia64/asmmacro.h bitops.h -> linux/include/asm-ia64/bitops.h break.h -> linux/include/asm-ia64/break.h byteorder.h -> linux/include/asm-ia64/byteorder.h diff --git a/xen/include/asm-ia64/linux-xen/asm/asmmacro.h b/xen/include/asm-ia64/linux/asm/asmmacro.h similarity index 100% rename from xen/include/asm-ia64/linux-xen/asm/asmmacro.h rename to xen/include/asm-ia64/linux/asm/asmmacro.h -- 2.30.2